bitkeeper revision 1.1159.79.12 (41516f7a9MigXms0I3CfpKQvDloo8Q)

Simplify use from outside the toplevel Makefile.

diff --git a/netbsd-2.0-xen-sparse/nbconfig-xen b/netbsd-2.0-xen-sparse/nbconfig-xen
index 38a485c6a40c97fac9b43fc33d2f83f750e22a97..23c33c7ac213d1d343a48c64b2da6dd9fee079b3 100755 (executable)
--- a/netbsd-2.0-xen-sparse/nbconfig-xen
+++ b/netbsd-2.0-xen-sparse/nbconfig-xen
@@ -5,6 +5,7 @@
 : ${HARCH:=$(uname -i)}
 : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
 : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
+: ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
 
 TOOLDIR="$TOPDIR/../netbsd-${NETBSD_RELEASE}-tools/$HOS-$HARCH"; export TOOLDIR
 

diff --git a/netbsd-2.0-xen-sparse/nbmake-xen b/netbsd-2.0-xen-sparse/nbmake-xen
index 7e2178f01edbd6402771fd46af07b461cf1cbbf0..64cb7a5c38ffb8de15be3c6f2050c38a19472ea5 100755 (executable)
--- a/netbsd-2.0-xen-sparse/nbmake-xen
+++ b/netbsd-2.0-xen-sparse/nbmake-xen
@@ -7,6 +7,7 @@
 : ${HARCH:=$(uname -i)}
 : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
 : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
+: ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
 
 NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR
 DESTDIR="$TOPDIR/root"; export DESTDIR